projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1dbd11 dbb2d95)
bitkeeper revision 1.1159.212.51 (41fa5cccoJa4CtdiYB99zon6qwiusw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 28 Jan 2005 15:39:56 +0000 (15:39 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 28 Jan 2005 15:39:56 +0000 (15:39 +0000)
Merge firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/x86_32/xen.lds patch | diff1 | diff2 | blob | history
xen/arch/x86/x86_64/xen.lds patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/x86_32/xen.lds
Simple merge
diff --cc xen/arch/x86/x86_64/xen.lds
Simple merge
Unnamed repository; edit this file 'description' to name the repository.